a33caf487a1d8fce18b7c5b41243add50a4e99b4,servers/src/main/java/tachyon/worker/block/TieredBlockStore.java,TieredBlockStore,freeSpaceNoEvictionLock,#number#number#BlockStoreLocation#,378

Before Change


      long blockId = entry.getFirst();
      BlockStoreLocation newLocation = entry.getSecond();
      // TODO: Handle absent
      long lockId = mLockManager.lockBlock(userId, blockId, BlockLockType.WRITE).get();
      boolean result = moveBlockNoLock(userId, blockId, newLocation);
      mLockManager.unlockBlock(lockId);
      if (!result) {
        LOG.error("Failed to free space: cannot move block {} to {}", blockId, newLocation);
        return false;

After Change


    for (Pair<Long, BlockStoreLocation> entry : plan.toMove()) {
      long blockId = entry.getFirst();
      BlockStoreLocation newLocation = entry.getSecond();
      long lockId = mLockManager.lockBlock(userId, blockId, BlockLockType.WRITE);
      try {
        moveBlockNoLock(userId, blockId, newLocation);
      } catch (IOException e) {